From: Juanma Barranquero <lekktu@gmail.com>
Date: Sat, 3 Oct 2009 13:31:08 +0000 (+0000)
Subject: * window.c (Fdelete_window): Check WINDOW argument.  (Bug#4618)
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~10097
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=79c4ddbdc44c2e7c98e9a62144aecd60a4926d39;p=emacs.git

* window.c (Fdelete_window): Check WINDOW argument.  (Bug#4618)
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 9548fca9878..c180235ee0a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-03  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.c (Fdelete_window): Check WINDOW argument.  (Bug#4618)
+
 2009-10-02  Michael Albinus  <michael.albinus@gmx.de>
 
 	* lisp.h (Qdelete_directory_internal): Removed, because it is not
diff --git a/src/window.c b/src/window.c
index 08fd8c829fa..9b50a85b0ca 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1533,6 +1533,9 @@ Signal an error when WINDOW is the only window on its frame.  */)
   struct frame *f;
   if (NILP (window))
     window = selected_window;
+  else
+    CHECK_LIVE_WINDOW (window);
+
   f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
   delete_window (window);